Set info->icon_list to NULL after freeing it. (#165800, Damon Chaplin)

2005-02-01  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkwindow.c (gtk_window_set_icon_name): Set info->icon_list
	to NULL after freeing it.  (#165800, Damon Chaplin)

diff --git a/ChangeLog b/ChangeLog
index 8b16d0f324271d47d941b4f0930cf31146881010..2d8b4775f200049e4f977d40170662bfc462fa70 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-01  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_set_icon_name): Set info->icon_list
+       to NULL after freeing it.  (#165800, Damon Chaplin)
+
 2005-02-01  Michael Natterer  <mitch@gimp.org>
 
        * configure.in: depend on stable pango-1.8, not unstable 1.7

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8b16d0f324271d47d941b4f0930cf31146881010..2d8b4775f200049e4f977d40170662bfc462fa70 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-02-01  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_set_icon_name): Set info->icon_list
+       to NULL after freeing it.  (#165800, Damon Chaplin)
+
 2005-02-01  Michael Natterer  <mitch@gimp.org>
 
        * configure.in: depend on stable pango-1.8, not unstable 1.7

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8b16d0f324271d47d941b4f0930cf31146881010..2d8b4775f200049e4f977d40170662bfc462fa70 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-02-01  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_set_icon_name): Set info->icon_list
+       to NULL after freeing it.  (#165800, Damon Chaplin)
+
 2005-02-01  Michael Natterer  <mitch@gimp.org>
 
        * configure.in: depend on stable pango-1.8, not unstable 1.7

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index bd58f3e7bcdb123befbfe6a28077a2ceb599ae89..20b024369c991ba4e2e6acc24356661576b5a008 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -2890,6 +2890,7 @@ gtk_window_set_icon_name (GtkWindow   *window,
 
   g_list_foreach (info->icon_list, (GFunc) g_object_unref, NULL);
   g_list_free (info->icon_list);
+  info->icon_list = NULL;
   
   update_themed_icon (NULL, window);